Get rid of the unused event argument. Update all callers.

2007-03-09  Matthias Clasen <mclasen@redhat.com>

        * gtk/gtktextview.c (gtk_text_view_end_selection_drag):
        Get rid of the unused event argument. Update all callers.

        * gtk/gtktextview.c (gtk_text_view_focus_out): Call
        gtk_text_view_end_selection_drag.  (#351671, Boyd Timothy)

svn path=/trunk/; revision=17449

diff --git a/ChangeLog b/ChangeLog
index 52d957a6062d9b83487dfb573efde439a64b13d2..e865edb6808c7cb89dd6a03098fd58c5f52c9f62 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-03-09  Matthias Clasen <mclasen@redhat.com>
+
+       * gtk/gtktextview.c (gtk_text_view_end_selection_drag):
+       Get rid of the unused event argument. Update all callers.
+
+       * gtk/gtktextview.c (gtk_text_view_focus_out): Call
+       gtk_text_view_end_selection_drag.  (#351671, Boyd Timothy)
+
 2007-03-09  Matthias Clasen <mclasen@redhat.com>
 
        * modules/input/gtkimcontextxim.c 

diff --git a/gtk/gtktextview.c b/gtk/gtktextview.c
index 931b0304de4961beac6b3168d644a8d9f421c63d..2eff8e2ca0d3508219878581e9d02273842429e4 100644 (file)
--- a/gtk/gtktextview.c
+++ b/gtk/gtktextview.c
@@ -294,8 +294,7 @@ static void     gtk_text_view_reset_im_context       (GtkTextView        *text_v
 static void     gtk_text_view_start_selection_drag   (GtkTextView        *text_view,
                                                       const GtkTextIter  *iter,
                                                       GdkEventButton     *event);
-static gboolean gtk_text_view_end_selection_drag     (GtkTextView        *text_view,
-                                                      GdkEventButton     *event);
+static gboolean gtk_text_view_end_selection_drag     (GtkTextView        *text_view);
 static void     gtk_text_view_start_selection_dnd    (GtkTextView        *text_view,
                                                       const GtkTextIter  *iter,
                                                       GdkEventMotion     *event);
@@ -3723,7 +3722,7 @@ gtk_text_view_grab_notify (GtkWidget *widget,
 {
   if (!was_grabbed)
     {
-      gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget), NULL);
+      gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget));
       gtk_text_view_unobscure_mouse_cursor (GTK_TEXT_VIEW (widget));
     }
 }
@@ -4041,7 +4040,7 @@ gtk_text_view_button_press_event (GtkWidget *widget, GdkEventButton *event)
     {
       GtkTextIter iter;
 
-      gtk_text_view_end_selection_drag (text_view, event);      
+      gtk_text_view_end_selection_drag (text_view);
 
       gtk_text_layout_get_iter_at_pixel (text_view->layout,
                                         &iter,
@@ -4073,7 +4072,7 @@ gtk_text_view_button_release_event (GtkWidget *widget, GdkEventButton *event)
           text_view->drag_start_y = -1;
         }
 
-      if (gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget), event))
+      if (gtk_text_view_end_selection_drag (GTK_TEXT_VIEW (widget)))
         return TRUE;
       else if (text_view->pending_place_cursor_button == event->button)
         {
@@ -4140,6 +4139,8 @@ gtk_text_view_focus_out_event (GtkWidget *widget, GdkEventFocus *event)
 {
   GtkTextView *text_view = GTK_TEXT_VIEW (widget);
 
+  gtk_text_view_end_selection_drag (text_view);
+
   gtk_widget_queue_draw (widget);
 
   DV(g_print (G_STRLOC": focus_out_event\n"));
@@ -5876,8 +5877,7 @@ gtk_text_view_start_selection_drag (GtkTextView       *text_view,
 
 /* returns whether we were really dragging */
 static gboolean
-gtk_text_view_end_selection_drag (GtkTextView    *text_view, 
-                                 GdkEventButton *event)
+gtk_text_view_end_selection_drag (GtkTextView    *text_view) 
 {
   if (text_view->selection_drag_handler == 0)
     return FALSE;
@@ -6096,7 +6096,7 @@ gtk_text_view_destroy_layout (GtkTextView *text_view)
         }
       
       gtk_text_view_stop_cursor_blink (text_view);
-      gtk_text_view_end_selection_drag (text_view, NULL);
+      gtk_text_view_end_selection_drag (text_view);
 
       g_object_unref (text_view->layout);
       text_view->layout = NULL;